run manual dh_install to install viskores.pc before deleting excess files

otherwise Qt files (intended for libvtk9-qt-dev) get reinstalled into
libvtk9-dev

diff --git a/debian/changelog b/debian/changelog
index 23d5ebf2597b06d5e45c61d88836542497451945..b1aec73ee6376d947e48668ee881f43b62adf772 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vtk9 (9.6.2+dfsg1-1exp4) UNRELEASED; urgency=medium
+
+  * debian/rules: run manual dh_install to install viskores.pc before
+    deleting excess files from libvtk9-dev, otherwise Qt files
+    (intended for libvtk9-qt-dev) get reinstalled
+
+ -- Drew Parsons <dparsons@debian.org>  Fri, 26 Jun 2026 13:42:41 +0200
+
 vtk9 (9.6.2+dfsg1-1exp3) experimental; urgency=medium
 
   * Team upload.

diff --git a/debian/rules b/debian/rules
index 4acc2fe38aa9c6ee60f0dbcb2c0e2d730bb4f761..0c556b646071e7df14584cf39cb0b06f200eb7e9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -161,15 +161,15 @@ endif
        sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-*/VTK-targets.cmake
 
 execute_after_dh_install:
+ifneq ($(DEB_HOST_ARCH_BITS),32)
+       dh_install -plibvtk9-dev usr/lib/*/pkgconfig/viskores.pc
+endif
        rm -rf $(CURDIR)/debian/tmp/usr/share/licenses
        find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -delete || true
        find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -delete || true
        find $(CURDIR)/debian/libvtk$(UPSTREAM_VERSION_ABI)/ -name "*Qt*" -delete || true
        find $(CURDIR)/debian/tmp/usr/share/doc/vtk-*/doxygen -name "_formulas.log" -delete || true
        find $(CURDIR)/debian/build/Utilities/Doxygen/doc/html -name "_formulas.log" -delete || true
-ifneq ($(DEB_HOST_ARCH_BITS),32)
-       dh_install -plibvtk9-dev usr/lib/*/pkgconfig/viskores.pc
-endif
 
 # Fix privacy breach
 execute_after_dh_installdocs-indep: